Add symbian uids.

Also a few other random fixups, and removing of legacy stuff from early
attempts at sybian integration.

Note that the examples do not get a UID - apparently its not mandatory
for the examples.

Change-Id: I4af7dbe5ef2ec8acb4eea042428887fbf8f5bfe3

9 files changed, 51 insertions, 55 deletions

diff --git a/devices/symbian/symbian.pro b/devices/symbian/symbian.pro
index 84ce237d..6ea2b580 100644
--- a/devices/symbian/symbian.pro
+++ b/devices/symbian/symbian.pro
@@ -7,16 +7,21 @@ symbian {
     SUBDIRS=
     # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
     # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
-    TARGET = "Qt3D$${QT_LIBINFIX}"
+    TARGET = "Qt Quick 3D"
 
+    # This is the UID for the overall .SIS file package
+    TARGET.UID3 = 0x20031E9A
 
-    isEmpty(QT_LIBINFIX) {
-        # TODO: Use signed UID
-        TARGET.UID3 = 0xE001E61E
-    } else {
-        # Always use experimental UID for infixed configuration to avoid UID clash
-        TARGET.UID3 = 0xE001E61E
-    }
+    VERSION = 1.0.0
+
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia\"" \
+        " "
+    qt3dlibraries.pkg_prerules += vendorinfo
 
     qt3dlibraries.sources = Qt3D$${QT_LIBINFIX}.dll
     qt3dlibraries.path = /sys/bin
@@ -42,23 +47,21 @@ symbian {
     qt3dimageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
     DEPLOYMENT += qt3dimageformats_plugins
 
-    contains(QT_CONFIG, declarative): {
-        qt3dquick.sources = Qt3DQuick$${QT_LIBINFIX}.dll
-        qt3dquick.path = /sys/bin
-        qt3dthreedImports.sources = \
-                                qthreedqmlplugin.dll \
-                                $$PWD/../../src/imports/threed/qmldir
-        qt3dthreedImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D
-        qt3dshapesImports.sources = \
-                                qshapesqmlplugin.dll \
-                                $$PWD/../../src/imports/shapes/Cube.qml \
-                                $$PWD/../../src/imports/shapes/cube.obj \
-                                $$PWD/../../src/imports/shapes/Quad.qml \
-                                $$PWD/../../src/imports/shapes/quad.obj \
-                                $$PWD/../../src/imports/shapes/Teapot.qml \
-                                $$PWD/../../src/imports/shapes/teapot.bez \
-                                $$PWD/../../src/imports/shapes/qmldir
-        qt3dshapesImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D/Shapes
-        DEPLOYMENT += qt3dquick qt3dthreedImports qt3dshapesImports
-    }
+    qt3dquick.sources = Qt3DQuick$${QT_LIBINFIX}.dll
+    qt3dquick.path = /sys/bin
+    qt3dthreedImports.sources = \
+                            qthreedqmlplugin.dll \
+                            $$PWD/../../src/imports/threed/qmldir
+    qt3dthreedImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D
+    qt3dshapesImports.sources = \
+                            qshapesqmlplugin.dll \
+                            $$PWD/../../src/imports/shapes/Cube.qml \
+                            $$PWD/../../src/imports/shapes/cube.obj \
+                            $$PWD/../../src/imports/shapes/Quad.qml \
+                            $$PWD/../../src/imports/shapes/quad.obj \
+                            $$PWD/../../src/imports/shapes/Teapot.qml \
+                            $$PWD/../../src/imports/shapes/teapot.bez \
+                            $$PWD/../../src/imports/shapes/qmldir
+    qt3dshapesImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D/Shapes
+    DEPLOYMENT += qt3dquick qt3dthreedImports qt3dshapesImports
 }
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index de74f05f..283d3e29 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -43,11 +43,9 @@ symbian {
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
     LIBS += -lQt3D -lQt3DQuick
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
+    TARGET.EPOCALLOWDLLDATA = 1
+    TARGET.CAPABILITY = All -Tcb
+    TARGET.UID3 = 0x20031E9C
 }
 
 SOURCES += \
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 43027c3d..1269307b 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -43,11 +43,8 @@ symbian {
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
     LIBS += -lQt3D -lQt3DQuick
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
+    TARGET.CAPABILITY = All -Tcb
+    TARGET.UID3 = 0x20031E9B
 }
 
 SOURCES += \
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index 57ab0e44..6b914fb1 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -8,3 +8,6 @@ SOURCES += main.cpp \
     qtgafile.cpp
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target
+symbian {
+    TARGET.UID3 = 0x20031E99
+}
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index 64e6e132..b1aa081c 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -16,10 +16,6 @@ wince*:LIBS += $$QMAKE_LIBS_GUI
 
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
+    TARGET.CAPABILITY = All -Tcb
     TARGET = $${TARGET}$${QT_LIBINFIX}
 }
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index 03492f44..ab5505ca 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -39,8 +39,10 @@ package {
     DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
-symbian: LIBS += -lQt3D
-
+symbian {
+    LIBS += -lQt3D
+    TARGET.UID3 = 0x20031E97
+}
 # suppress warnings about std::copy using unsafe parameters
 win32: DEFINES +=_SCL_SECURE_NO_WARNINGS
 
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index b3a192c1..3e0f5933 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -31,4 +31,7 @@ package {
     CONFIG += qt3d
     DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
-symbian: LIBS += -lQt3D
+symbian {
+    LIBS += -lQt3D
+    TARGET.UID3 = 0x20031E98
+}
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index ead8f622..63ac0d3b 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -54,11 +54,8 @@ symbian {
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
     LIBS += -lQt3D
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
+    TARGET.UID3 = 0x20031E96
+    TARGET.CAPABILITY = All -Tcb
 }
 
 include(quick3d.pri)
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index 985c451b..a8c4fdef 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -35,11 +35,8 @@ symbian {
     DEFINES += QT_MAKEDLL
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
+    TARGET.CAPABILITY = All -Tcb
+    TARGET.UID3 = 0x20031E95
 }
 
 include(../private/private.pri)